gdk: Remove deprecated gdk_threads_set_lock_functions

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 59808a0f0b85caabdd52b227bc68dd03042753a2..10629d08a6448c4436487b3e3d6e234386499238 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -633,7 +633,6 @@ GDK_THREADS_LEAVE
 gdk_threads_init
 gdk_threads_enter
 gdk_threads_leave
-gdk_threads_set_lock_functions
 gdk_threads_add_idle
 gdk_threads_add_idle_full
 gdk_threads_add_timeout

diff --git a/gdk/gdk.c b/gdk/gdk.c
index e7e1b3c3bf473ac7a671ec9596e97959bbbdf9fe..46cd9c5a5c0f674073090d83a1dd6c7e1923dd30 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -670,49 +670,6 @@ gdk_threads_init (void)
     gdk_threads_unlock = gdk_threads_impl_unlock;
 }
 
-/**
- * gdk_threads_set_lock_functions: (skip)
- * @enter_fn:   function called to guard GDK
- * @leave_fn: function called to release the guard
- *
- * Allows the application to replace the standard method that
- * GDK uses to protect its data structures. Normally, GDK
- * creates a single #GMutex that is locked by gdk_threads_enter(),
- * and released by gdk_threads_leave(); using this function an
- * application provides, instead, a function @enter_fn that is
- * called by gdk_threads_enter() and a function @leave_fn that is
- * called by gdk_threads_leave().
- *
- * The functions must provide at least same locking functionality
- * as the default implementation, but can also do extra application
- * specific processing.
- *
- * As an example, consider an application that has its own recursive
- * lock that when held, holds the GTK+ lock as well. When GTK+ unlocks
- * the GTK+ lock when entering a recursive main loop, the application
- * must temporarily release its lock as well.
- *
- * Most threaded GTK+ apps won’t need to use this method.
- *
- * This method must be called before gdk_threads_init(), and cannot
- * be called multiple times.
- *
- * Deprecated:3.6: All GDK and GTK+ calls should be made from the main
- *     thread
- *
- * Since: 2.4
- **/
-void
-gdk_threads_set_lock_functions (GCallback enter_fn,
-                                GCallback leave_fn)
-{
-  g_return_if_fail (gdk_threads_lock == NULL &&
-                    gdk_threads_unlock == NULL);
-
-  gdk_threads_lock = enter_fn;
-  gdk_threads_unlock = leave_fn;
-}
-
 static gboolean
 gdk_threads_dispatch (gpointer data)
 {

diff --git a/gdk/gdkthreads.h b/gdk/gdkthreads.h
index 8bdc3e4388b1a3223251356dbe330e6d5e4840a3..7d4a9a9fd61192eedda43cd20340055273ad945b 100644 (file)
--- a/gdk/gdkthreads.h
+++ b/gdk/gdkthreads.h
@@ -46,9 +46,6 @@ GDK_THREADS_DEPRECATED
 void     gdk_threads_enter                    (void);
 GDK_THREADS_DEPRECATED
 void     gdk_threads_leave                    (void);
-GDK_THREADS_DEPRECATED
-void     gdk_threads_set_lock_functions       (GCallback enter_fn,
-                                               GCallback leave_fn);
 
 GDK_AVAILABLE_IN_ALL
 guint    gdk_threads_add_idle_full            (gint           priority,